Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Oct 2012 11:47:42 +0000 (13:47 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Oct 2012 11:47:42 +0000 (13:47 +0200)
commit5a2b82979df626ec2e3de7bfd2eda20435f86122
treebc1d866619027732bc6ffd14f9b4eb781d0844e7
parent19a47b490b420fdb4d4d8a0f5fcef6a2ae6e6848
parent1b090f77d5cbd22a2c3cdd92d50728ead7a23c74
Merge from trunk.
lisp/ChangeLog
src/ChangeLog